Allow Command-Escape keybindings by jakeleventhal · Pull Request #4307 · pingdotgg/t3code

jakeleventhal · 2026-07-22T20:33:59Z

Summary

Screen.Recording.2026-07-22.at.4.30.09.PM.mov

allow modified Escape to be recorded as mod+esc while keeping bare Escape as the recorder cancel action
bridge native Command-Escape input into the focused Electron renderer, including preview webviews
register the macOS shortcut only while T3 Code is focused so it is not claimed while the app is in the background

Root cause

macOS consumes a physical Command-Escape chord before Chromium emits the renderer keyboard event. The keybinding recorder therefore stayed blank even though its web-level normalization supported mod+esc.

Validation

vp test run apps/web/src/components/settings/KeybindingsSettings.logic.test.ts apps/desktop/src/keybindings/NativeKeybindingCapture.test.ts apps/desktop/src/preview/Manager.test.ts apps/desktop/src/window/DesktopWindow.test.ts (56 tests)
targeted vp lint for all changed files
vp run typecheck in apps/desktop
vp run typecheck in apps/web
manually verified a physical Command-Escape chord records mod+esc in T3 Code Dev

Note

Allow `mod+esc` keybindings and prevent modified `Escape` from dismissing UI

Added isEscapeDismissal and cancelNonDismissalEscape in keybindings.ts to distinguish plain Escape from modified Escape (e.g., Cmd+Esc)
Updated Base UI primitives and custom components to only dismiss on plain Escape, allowing modified Escape to propagate
Added NativeKeybindingCapture.ts and updated DesktopWindow.ts and Manager.ts to intercept modified Escape at the Electron level and forward it to the web app for keybinding capture
Behavioral Change: Escape with metaKey (macOS) or ctrlKey (other platforms) no longer closes dialogs, menus, or settings panels; it is now captured as a keybinding. Any component not updated to use isEscapeDismissal will still treat modified Escape as dismissal

^{Macroscope summarized 9ce96d8.}

Note

Medium Risk
Touches global shortcuts and broad Escape handling across the app; incorrect dismissal logic could leave dialogs open or break cancel flows, but changes are covered by targeted tests.

Overview
macOS never delivers Command+Escape to the renderer, so this PR captures it in Electron and re-injects a synthetic keydown so shortcuts can be recorded and used as mod+esc.

On macOS, the main window registers the full Command+modifier+Escape set via globalShortcut while the app is focused (unregister on blur/close). Preview webviews and non-macOS main windows use before-input-event to preventDefault and IPC desktop:native-keybinding-capture through preload into the renderer. Capture targets data-keybinding-capture when that input is focused, otherwise window.

The web layer adds isEscapeDismissal and cancelNonDismissalEscape so plain Escape still cancels UI, but platform-mod+Escape is not treated as dismiss. That logic is wired through keybinding recorders, many dismiss handlers, and Base UI roots (dialog, menu, combobox, etc.). keybindingFromKeyboardEvent already maps modified Escape to mod+esc; bare Escape stays null for cancel during capture.

^{Reviewed by Cursor Bugbot for commit 9ce96d8. Bugbot is set up for automated code reviews on this repo. Configure here.}

coderabbitai · 2026-07-22T20:34:07Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 9f009ee1-f17a-44b9-8680-091a3e4c1064

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

macroscopeapp · 2026-07-22T20:43:15Z

Approvability

Verdict: Not approved

Macroscope's review found this PR not approvable — This PR introduces native/global shortcut registration, cross-process keyboard routing, and broad changes to Escape dismissal behavior across shared UI primitives and production components. Its cross-platform lifecycle and behavioral scope warrant human review despite targeted test coverage.

^{You can add or adjust custom eligibility rules. Learn more.}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d9d2d6ae96

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8d85b2c618

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…flict-comment-fixes # Conflicts: # apps/desktop/src/window/DesktopWindow.ts # apps/web/src/components/CommandPalette.tsx # apps/web/src/routes/settings.tsx

macroscopeapp

One consistency issue found in the keybinding recorder: it now accepts Escape combinations that isEscapeDismissal still classifies as ordinary dismissal, so those bindings collide with the app-wide Escape handling this PR just standardized. Details inline.

^{Posted via Macroscope — UI Consistency}

macroscopeapp

One finding: the new isEscapeDismissal contract is only applied to about half of the app's Escape-dismissal handlers, so mod+esc still double-fires at the remaining sites in browser mode. Details inline.

^{Posted via Macroscope — UI Consistency}

macroscopeapp

One finding: the project-script keybinding recorder is now part of the native mod+esc capture contract but does not follow the isEscapeDismissal policy the two settings recorders adopted, so it can still record Escape combos that the rest of the app treats as dismissals.

The previously flagged issues (incomplete isEscapeDismissal adoption across web Escape handlers, and the settings recorders accepting non-mod Escape combos) are addressed at this head.

^{Posted via Macroscope — UI Consistency}

…flict-comment-fixes

macroscopeapp

One consistency gap on the new mod+esc reservation: Base UI's own Escape dismissal paths are still ungated except in projectScriptEditor.tsx, so in the browser mod+esc continues to dismiss overlays and the new gate in CommandPalette has no effect. Details inline.

^{Posted via Macroscope — UI Consistency}

macroscopeapp

One finding: the new mod+esc dismissal gate added to the model picker is attached to the inline Combobox, which never emits an escape-key open-change, while the Popover that actually owns the picker's visibility stays ungated. Details inline.

^{Posted via Macroscope — UI Consistency}

macroscopeapp

One finding: the new mod+esc reservation is installed per call site on only three Base UI overlays, so identical overlays elsewhere still dismiss on mod+esc. Detail inline on apps/web/src/components/chat/ProviderModelPicker.tsx.

The raw event.key === "Escape" migration itself looks complete now — no ungated "Escape" comparisons remain under apps/web/src, and both keybinding recorders plus projectScriptEditor now cancel recording through isEscapeDismissal, so non-mod Escape chords are no longer recordable while being treated as dismissals elsewhere.

^{Posted via Macroscope — UI Consistency}

macroscopeapp

Two gaps in the new mod+esc reservation, both in the shared overlay layer.

^{Posted via Macroscope — UI Consistency}

…flict-comment-fixes

macroscopeapp

One finding: the new macOS Escape shortcut wiring in apps/desktop/src/window/DesktopWindow.ts registers app-level Electron listeners through the raw Electron.app global instead of the ElectronApp service the module already acquires from the environment.

^{Posted via Macroscope — Effect Service Conventions}

macroscopeapp

One finding: the new macOS Escape shortcut wiring in apps/desktop/src/window/DesktopWindow.ts registers app-level Electron listeners through the raw Electron.app global instead of the ElectronApp service the module already acquires from the environment.

^{Posted via Macroscope — Effect Service Conventions}

…flict-comment-fixes

cursor

Cursor Bugbot has reviewed your changes using high effort and found 2 potential issues.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 9ce96d8. Configure here.}

cursor · 2026-08-26T04:16:35Z

+  {
+    accelerator: "Command+Alt+Escape",
+    input: { key: "Escape", metaKey: true, ctrlKey: false, altKey: true, shiftKey: false },
+  },


Force Quit shortcut stolen on macOS

High Severity

MACOS_MOD_ESCAPE_SHORTCUTS registers Command+Alt+Escape with globalShortcut whenever T3 Code is focused. That chord is macOS Force Quit, and Electron can intercept it, so Force Quit is suppressed exactly while this app has focus—the case where users need it most if the UI hangs.

Additional Locations (1)

apps/desktop/src/window/DesktopWindow.ts#L433-L447

^{Reviewed by Cursor Bugbot for commit 9ce96d8. Configure here.}

cursor · 2026-08-26T04:16:35Z

                <Label htmlFor="script-keybinding">Keybinding</Label>
                <Input
                  id="script-keybinding"
+                  data-keybinding-capture=""


Recorder bypassed by ChatView capture

Medium Severity

Native mod+esc is dispatched to the project-script input marked data-keybinding-capture, but ChatView’s capture-phase shortcut handler never skips that attribute (unlike AppSidebarLayout). From the chat header script editor, an already-bound mod+esc can run via resolveShortcutCommand before the recorder sees the event.

Additional Locations (1)

apps/desktop/src/keybindings/NativeKeybindingCapture.ts#L50-L65

^{Reviewed by Cursor Bugbot for commit 9ce96d8. Configure here.}

jakeleventhal · 2026-08-26T04:17:54Z

Closing in favor of a fresh, substantially simplified replacement PR.

github-actions Bot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:L 100-499 changed lines (additions + deletions). labels Jul 22, 2026

jakeleventhal marked this pull request as ready for review July 22, 2026 20:38

chatgpt-codex-connector Bot reviewed Jul 22, 2026

View reviewed changes

Comment thread apps/desktop/src/preview/Manager.ts Outdated

Comment thread apps/desktop/src/keybindings/NativeKeybindingCapture.ts Outdated

Comment thread apps/desktop/src/window/DesktopWindow.ts Outdated

cursor Bot reviewed Jul 24, 2026

View reviewed changes

Comment thread apps/desktop/src/window/DesktopWindow.ts Outdated

Comment thread apps/desktop/src/window/DesktopWindow.ts

jakeleventhal force-pushed the t3code/allow-esc-keybindings branch from 70f663e to 8d85b2c Compare July 29, 2026 16:02

cursor Bot reviewed Jul 29, 2026

View reviewed changes

Comment thread apps/desktop/src/window/DesktopWindow.ts Outdated

Comment thread apps/web/src/keybindings.ts

chatgpt-codex-connector Bot reviewed Jul 29, 2026

View reviewed changes

Comment thread apps/desktop/src/keybindings/NativeKeybindingCapture.ts

ChristmasSun mentioned this pull request Aug 8, 2026

feat(web): add a rebindable thread.interrupt keybinding #5669

Open

3 tasks

jakeleventhal force-pushed the t3code/allow-esc-keybindings branch from 8d85b2c to 12c5b19 Compare August 10, 2026 19:28

macroscopeapp Bot reviewed Aug 10, 2026

View reviewed changes

Comment thread apps/desktop/src/window/DesktopWindow.ts

cursor Bot reviewed Aug 10, 2026

View reviewed changes

Comment thread apps/desktop/src/keybindings/NativeKeybindingCapture.ts

jakeleventhal added 4 commits August 10, 2026 16:24

Allow Command-Escape keybindings

195cfdb

Fix native Escape shortcut routing

3b8c083

fix(desktop): preserve modified Escape shortcuts

d7583f5

fix(desktop): harden native Escape capture

d83a665

jakeleventhal force-pushed the t3code/allow-esc-keybindings branch from d25021f to d83a665 Compare August 10, 2026 20:25

t3dotgg added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. and removed vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Aug 24, 2026

Merge remote-tracking branch 'upstream/main' into t3code/upstream-con…

bbbeb0e

…flict-comment-fixes # Conflicts: # apps/desktop/src/window/DesktopWindow.ts # apps/web/src/components/CommandPalette.tsx # apps/web/src/routes/settings.tsx

macroscopeapp Bot reviewed Aug 26, 2026

View reviewed changes

Comment thread apps/web/src/components/settings/KeybindingsSettings.tsx

Comment thread apps/web/src/components/settings/KeybindingsSettings.tsx

fix(web): reserve only mod-Escape keybindings

9b46960

macroscopeapp Bot reviewed Aug 26, 2026

View reviewed changes

Comment thread apps/web/src/keybindings.ts

fix(web): reserve mod-Escape across dismissals

9458be4

macroscopeapp Bot reviewed Aug 26, 2026

View reviewed changes

Comment thread apps/web/src/components/projectScriptEditor.tsx

jakeleventhal added 2 commits August 25, 2026 22:54

fix(web): align script keybinding capture

991c566

Merge remote-tracking branch 'upstream/main' into t3code/upstream-con…

61cbcab

…flict-comment-fixes

cursor Bot reviewed Aug 26, 2026

View reviewed changes

Comment thread apps/web/src/components/projectScriptEditor.tsx

fix(web): keep mod-Escape recorder open

689ec23

macroscopeapp Bot reviewed Aug 26, 2026

View reviewed changes

Comment thread apps/web/src/components/CommandPalette.tsx

fix(web): preserve mod-Escape in Base UI overlays

635e573

macroscopeapp Bot reviewed Aug 26, 2026

View reviewed changes

Comment thread apps/web/src/components/chat/ModelPickerContent.tsx Outdated

fix(web): guard overlay Escape dismissal

9ed0163

macroscopeapp Bot reviewed Aug 26, 2026

View reviewed changes

Comment thread apps/web/src/components/chat/ProviderModelPicker.tsx Outdated

fix(web): reserve mod-Escape in overlay roots

c87375d

macroscopeapp Bot reviewed Aug 26, 2026

View reviewed changes

Comment thread apps/web/src/keybindings.ts

Comment thread apps/web/src/components/ui/menu.tsx

jakeleventhal added 2 commits August 25, 2026 23:54

fix(web): propagate reserved Escape shortcuts

046e768

Merge remote-tracking branch 'upstream/main' into t3code/upstream-con…

902e811

…flict-comment-fixes

github-actions Bot added size:XL 500-999 changed lines (additions + deletions). and removed size:L 100-499 changed lines (additions + deletions). labels Aug 26, 2026

macroscopeapp Bot reviewed Aug 26, 2026

View reviewed changes

Comment thread apps/desktop/src/window/DesktopWindow.ts Outdated

macroscopeapp Bot reviewed Aug 26, 2026

View reviewed changes

Comment thread apps/desktop/src/window/DesktopWindow.ts Outdated

jakeleventhal added 2 commits August 26, 2026 00:01

fix(desktop): scope native shortcut listeners

e0b0897

Merge remote-tracking branch 'upstream/main' into t3code/upstream-con…

9ce96d8

…flict-comment-fixes

cursor Bot reviewed Aug 26, 2026

View reviewed changes

jakeleventhal closed this Aug 26, 2026

Uh oh!

Conversation

jakeleventhal commented Jul 22, 2026 • edited by cursor Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Root cause

Validation

Allow mod+esc keybindings and prevent modified Escape from dismissing UI

Uh oh!

coderabbitai Bot commented Jul 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

macroscopeapp Bot commented Jul 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Approvability

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

macroscopeapp Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

macroscopeapp Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

macroscopeapp Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

macroscopeapp Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

macroscopeapp Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

macroscopeapp Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

macroscopeapp Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

macroscopeapp Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

macroscopeapp Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

cursor Bot Aug 26, 2026

Choose a reason for hiding this comment

Force Quit shortcut stolen on macOS

jakeleventhal commented Jul 22, 2026 •

edited by cursor Bot

Loading

Allow `mod+esc` keybindings and prevent modified `Escape` from dismissing UI

coderabbitai Bot commented Jul 22, 2026 •

edited

Loading

macroscopeapp Bot commented Jul 22, 2026 •

edited

Loading